From cf670606aa0f299fd4dbc7c504883bbed973924e Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sun, 5 Jun 2005 10:34:20 +0000 Subject: [PATCH] Return NULL unless screen number is zero. We have only one screen on 2005-06-05 Tor Lillqvist * gdk/win32/gdkscreen-win32.c (_gdk_windowing_substitute_screen_number): Return NULL unless screen number is zero. We have only one screen on Win32. (gdk_screen_make_display_name): Call gdk_display_get_name() and return that. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gdk/win32/gdkscreen-win32.c | 5 ++++- 4 files changed, 22 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1bc131cabe..baf8688ec0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2005-06-05 Tor Lillqvist + * gdk/win32/gdkscreen-win32.c + (_gdk_windowing_substitute_screen_number): Return NULL unless + screen number is zero. We have only one screen on Win32. + (gdk_screen_make_display_name): Call gdk_display_get_name() and + return that. + * modules/engines/Makefile.am * modules/input/Makefile.am: Decide whether to build the ms-windows theme engine based on the GDK backend, not based on diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 1bc131cabe..baf8688ec0 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,11 @@ 2005-06-05 Tor Lillqvist + * gdk/win32/gdkscreen-win32.c + (_gdk_windowing_substitute_screen_number): Return NULL unless + screen number is zero. We have only one screen on Win32. + (gdk_screen_make_display_name): Call gdk_display_get_name() and + return that. + * modules/engines/Makefile.am * modules/input/Makefile.am: Decide whether to build the ms-windows theme engine based on the GDK backend, not based on diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 1bc131cabe..baf8688ec0 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,11 @@ 2005-06-05 Tor Lillqvist + * gdk/win32/gdkscreen-win32.c + (_gdk_windowing_substitute_screen_number): Return NULL unless + screen number is zero. We have only one screen on Win32. + (gdk_screen_make_display_name): Call gdk_display_get_name() and + return that. + * modules/engines/Makefile.am * modules/input/Makefile.am: Decide whether to build the ms-windows theme engine based on the GDK backend, not based on diff --git a/gdk/win32/gdkscreen-win32.c b/gdk/win32/gdkscreen-win32.c index 45e151a377..91e3ff6a2f 100644 --- a/gdk/win32/gdkscreen-win32.c +++ b/gdk/win32/gdkscreen-win32.c @@ -106,11 +106,14 @@ gchar * _gdk_windowing_substitute_screen_number (const gchar *display_name, int screen_number) { + if (screen_number != 0) + return NULL; + return g_strdup (display_name); } gchar * gdk_screen_make_display_name (GdkScreen *screen) { - return g_strdup (""); + return gdk_display_get_name (_gdk_display); } -- 2.30.2